3ba347bcf8
Conflict gitignore
2014-09-14 14:47:31 +03:00
liranbg
c6c618e87e
Merge branch 'sagi_dev'
2014-09-14 10:52:53 +03:00
liranbg
5a0685a815
git ignore update
2014-09-14 10:52:40 +03:00
Liran BN
ddb49be4c6
Merge branch 'master' of https://github.com/liranbg/JceManager
2014-09-13 12:35:47 +03:00
Liran BN
65bee505d0
.pro fix
2014-09-13 12:31:23 +03:00
502f06e3c0
Ignore the website files
2014-09-12 23:00:39 +03:00
99aa0ed909
Fix #10
...
Added a bool flag to main.
calendarLoaded.
@liranbg - you method did not work (at least on linux)...
now user will be prompted with an error message dialog. No Crash.
Closing bug #10
2014-09-12 12:11:28 +03:00
3287bfe31b
.pro
2014-09-12 11:59:00 +03:00
fe5a144bd3
Merge branch 'master' of https://github.com/liranbg/JceManager
2014-09-12 11:54:09 +03:00
b3c9251eef
gitignore
2014-09-12 11:54:00 +03:00
liranbg
00477ab26d
nothing special
2014-09-12 11:50:21 +03:00
liranbg
8a5f99279c
fix null ptr on exportCalendarCSV
2014-09-12 11:43:55 +03:00
Liran BN
e67505b9ee
some pointers checking, still bugged
2014-09-11 23:08:37 +03:00
Liran BN
375b72feac
add icon the date dialog. dates changed by default. translate update. still bugged
2014-09-11 22:58:08 +03:00
Liran BN
078f885909
calendar dialog function are inside calendarmanager
2014-09-11 15:48:23 +03:00
liranbg
884cc76049
Merge pull request #9 from sagidayan/master
...
Export to CSV with Semester begin & end
2014-09-11 15:28:28 +03:00
a684e59628
Merge conflict fix
2014-09-11 15:27:00 +03:00
liranbg
834ee3469e
translation fixes
2014-09-11 06:24:52 +03:00
5c92a3f112
Export to CSV with Semester begin & end
...
all bugs that i found fixed.
now when user selects "export to csv" he will be prompt
to input the begining and the end of the semester.
the csv file will populate the whole semester!
just one click and you are done.
@liranbg (Liran) please check on Windows and OSX.
linux is rocking!
let me know if you need anything else.
sagi
2014-09-09 23:31:48 +03:00
eb5de02be2
Fixes to the Calendar Dialog. QA
2014-09-09 21:24:53 +03:00
bc7d61fa38
Undeg HARD dev - calendar dialog for helping CSV exporter
2014-09-09 14:40:11 +03:00
Liran BN
fc477a3239
error icon on empty string input
2014-09-09 11:20:58 +03:00
liranbg
9a59a99539
Merge pull request #8 from sagidayan/master
...
Fixed the 💩 in CSV - need test on mac and win
2014-09-08 21:02:16 +03:00
df791d62b4
Need testing on mac and Windows
2014-09-08 20:59:02 +03:00
431b71bebc
Fixed the CSV bug
2014-09-08 20:52:38 +03:00
liranbg
856974c144
Merge pull request #7 from sagidayan/master
...
Local changes according to users settings + CSV extention file is fixed
2014-09-08 20:39:32 +03:00
d73dc6bb9e
Local changes according to users settings + CSV extention file is fixed
2014-09-08 20:07:42 +03:00
Liran Ben gida
235354210b
Added CSV on linux, mac, windows
2014-09-08 18:54:52 +03:00
Liran BN
4fa27283d9
Revert "CVS OPTION ADDED, minor improvments"
...
This reverts commit cd43b26d50
2014-09-08 17:30:18 +03:00
Liran BN
cd43b26d50
CVS OPTION ADDED, minor improvments
2014-09-08 17:29:49 +03:00
liranbg
f022291ed6
Merge pull request #6 from sagidayan/master
...
CSV Export of the calendar
2014-09-08 14:48:53 +03:00
f63ac39fdc
Added Encription Lib From Qt-Project And Modified the shit out of it.
...
Now the password should be encrypted.
See that encrypt and decrypt key is the same key!
cheers!
2014-09-07 23:44:27 +03:00
af10a074c0
User Dialog Message to the export resaults
2014-09-07 23:14:04 +03:00
11b4101c58
Added Featcher: Export calendar to CSV format for
...
GoogleCalendar/iCal/Outlook
at the gui - calendar tab - there is now an export to csv button.
clicking it will prompt thr user to save the file on his system hard
drive. the app will add the .csv extention.
the csv file, will export only one week, starting from the begining of
the first semester of 2015 (the one that is coming).
in the future i will add a Held doc for exporting and importimg to the
users calendar.
cheers!
2014-09-07 22:57:01 +03:00
49e38dbc27
Merge branch 'master' of https://github.com/liranbg/jceAverageCalculator
2014-09-02 14:50:40 +03:00
94408fe9b7
Delete QT user config - need to be add to gitignore
2014-09-02 14:50:33 +03:00
Liran BN
5563677671
schedule is almost done!
2014-09-02 01:19:24 +03:00
Liran BN
377c885d8a
ops
2014-09-01 20:06:58 +03:00
Liran BN
9bd232d44e
Merge branch 'sagidayan-master'
2014-09-01 20:05:27 +03:00
cf49325e3b
Tested and works! (SaveData)
...
Now all the data is saved as a binary file.
Note: the SaveData class is now an object!
works as it should!
2014-09-01 00:27:15 +03:00
1a3747956a
New way of saving data
...
not yet checked due to compiling errors coming from Liran's changes in
Page.h
pls, let me know if you fixed it. so i can run some tests!
2014-08-31 21:39:43 +03:00
8172f695d1
Merge fix
2014-08-31 20:54:33 +03:00
104002c301
merge conflict on my master - fix
2014-08-31 20:51:27 +03:00
Liran BN
65ce3d40ea
bugs
2014-08-31 12:35:43 +03:00
Liran BN
95ccaa39d0
Add calendar option
...
bug fixes, better phrasing, calendar option
2014-08-31 12:33:27 +03:00
Liran BG
1a3813d858
Merge branch 'master' of https://github.com/liranbg/jceAverageCalculator
2014-08-27 13:49:22 +03:00
Liran BG
b39a5a434a
a
2014-08-27 13:49:15 +03:00
liranbg
6769a160a6
Merge pull request #4 from sagidayan/master
...
Translation - En/He
2014-08-27 13:05:53 +03:00
liranbg
4f54ad85a7
connection fix
2014-07-11 17:01:25 +03:00
0bb2835865
Merge branch 'tr'
...
conflicts fixed - only in the credits...
Conflicts:
main/mainscreen.cpp
2014-06-28 07:19:58 +03:00
