API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 12th, 2016
133
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 17.30 KB | None | 0 0
raw download clone embed print report
  1. Script started on Sat 12 Nov 2016 02:13:11 PM EST
  2. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git status
  3. On branch announcements
  4. Your branch is up-to-date with 'origin/announcements'.
  5. Untracked files:
  6.   (use "git add <file>..." to include in what will be committed)
  7.  
  8.     system/migrate-mborn-user.php
  9.     typescript
  10.  
  11. nothing added to commit but untracked files present (use "git add" to track)
  12. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git branch -v
  13. * announcements a8fefb1 Whups, fixed bug with wrong filename for slide preview!
  14.   master        1e3131a Add support for missing image to the resizer script.
  15. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git checkout master
  16. Switched to branch 'master'
  17. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git status
  18. On branch master
  19. Untracked files:
  20.   (use "git add <file>..." to include in what will be committed)
  21.  
  22.     system/migrate-mborn-user.php
  23.     typescript
  24.  
  25. nothing added to commit but untracked files present (use "git add" to track)
  26. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git merge announcements
  27. Updating 1e3131a..a8fefb1
  28. Fast-forward
  29.  .gitignore                                                                    |   4 ++-
  30.  api/announcements/delete.php                                                  |  39 ++++++++++++++++++++
  31.  api/announcements/get.php                                                     |  38 ++++++++++++++++++++
  32.  api/announcements/insert.php                                                  |  88 ++++++++++++++++++++++++++++++++++++++++++++++
  33.  api/announcements/update.php                                                  |  94 +++++++++++++++++++++++++++++++++++++++++++++++++
  34.  api/slides/insert.php                                                         |   4 +--
  35.  api/slides/update.php                                                         |   4 +--
  36.  api/slides/updateSlideSelectedAnnouncement.php                                |  45 ++++++++++++++++++++++++
  37.  assets/images/signPlayerSettings/newSlideThumbnails/manageAnnouncement@2x.png | Bin 0 -> 511036 bytes
  38.  css/manageAnnouncements.css                                                   |  31 ++++++++++++++++
  39.  inc/manageAnnouncements.php                                                   |  75 +++++++++++++++++++++++++++++++++++++++
  40.  inc/manageStaff.php                                                           |  12 +++----
  41.  inc/sidebar.php                                                               |   3 +-
  42.  inc/signPlayerSettings.php                                                    |   3 +-
  43.  inc/signPlayerSettings/slideAnnouncement.php                                  |  18 ++++++++++
  44.  js/app.js                                                                     |   9 ++++-
  45.  js/manageAnnouncements.js                                                     | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  46.  js/signPlayerSettings.js                                                      |  46 ++++++++++++++++++++++--
  47.  libs/image-boss/imageBoss.php                                                 |   4 +--
  48.  modules/player/css/announcements.css                                          |  92 ++++++++++++++++++++++++++++++++++++++++++++++++
  49.  modules/player/slides/announcement.php                                        |  54 ++++++++++++++++++++++++++++
  50.  system/classes/announcements.php                                              | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  51.  system/classes/slides.php                                                     |  18 +++++++---
  52.  system/init.php                                                               |   3 +-
  53.  system/migrate.php                                                            |   7 ++--
  54.  25 files changed, 958 insertions(+), 26 deletions(-)
  55.  create mode 100644 api/announcements/delete.php
  56.  create mode 100644 api/announcements/get.php
  57.  create mode 100644 api/announcements/insert.php
  58.  create mode 100644 api/announcements/update.php
  59.  create mode 100644 api/slides/updateSlideSelectedAnnouncement.php
  60.  create mode 100644 assets/images/signPlayerSettings/newSlideThumbnails/manageAnnouncement@2x.png
  61.  create mode 100644 css/manageAnnouncements.css
  62.  create mode 100644 inc/manageAnnouncements.php
  63.  create mode 100644 inc/signPlayerSettings/slideAnnouncement.php
  64.  create mode 100644 js/manageAnnouncements.js
  65.  create mode 100644 modules/player/css/announcements.css
  66.  create mode 100644 modules/player/slides/announcement.php
  67.  create mode 100644 system/classes/announcements.php
  68. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git status
  69. On branch master
  70. Untracked files:
  71.   (use "git add <file>..." to include in what will be committed)
  72.  
  73.     system/migrate-mborn-user.php
  74.     typescript
  75.  
  76. nothing added to commit but untracked files present (use "git add" to track)
  77. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git remote -v
  78. origin  git@bitbucket.org:mborn319/sign-pilot-v2.git (fetch)
  79. origin  git@bitbucket.org:mborn319/sign-pilot-v2.git (push)
  80. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git remote remove origin
  81. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git remote add origin
  82. usage: git remote add [<options>] <name> <url>
  83.  
  84.     -f, --fetch           fetch the remote branches
  85.     --tags                import all tags and associated objects when fetching
  86.                           or do not fetch any tag at all (--no-tags)
  87.     -t, --track <branch>  branch(es) to track
  88.     -m, --master <branch>
  89.                           master branch
  90.     --mirror[=<push|fetch>]
  91.                           set up remote as a mirror to push to or fetch from
  92.  
  93. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git remote add origin git@bitbucket.org:centrevilletech/sign-pilot-v2.git
  94. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git remote -v
  95. origin  git@bitbucket.org:centrevilletech/sign-pilot-v2.git (fetch)
  96. origin  git@bitbucket.org:centrevilletech/sign-pilot-v2.git (push)
  97. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git log
  98. [?1h=
  99. commit a8fefb199d2d7c8838b56781bb4761fc2873f049
  100. Author: Michael Born <mborn319@gmail.com>
  101. Date:   Sat Nov 12 14:00:19 2016 -0500
  102. 
  103.     Whups, fixed bug with wrong filename for slide preview!
  104. 
  105. commit c0cda3c2b2507bdb003e525b62091926e1a0450b
  106. Author: Michael Born <mborn319@gmail.com>
  107. Date:   Sat Nov 12 13:56:49 2016 -0500
  108. 
  109.     Better conditional if there are no announcements
  110. 
  111. commit 976a7c52853e674cb81d88fd1d58a63bac4f0183
  112. Author: Michael Born <mborn319@gmail.com>
  113. Date:   Sat Nov 12 13:52:00 2016 -0500
  114. 
  115.     Fix bug with imageBoss debug statement breaking AJAX/JSON calls
  116. 
  117. commit fbe5434ce0e0969e59920a27dd5971bf30ad9e5e
  118. Author: Michael Born <mborn319@gmail.com>
  119. Date:   Sat Nov 12 13:18:32 2016 -0500
  120. 
  121.     Updated styles for announcement management screen
  122. 
  123. commit d00efa35dae879cd577699e7537536717ec55bba
  124. Author: Michael Born <mborn319@gmail.com>
  125. Date:   Sat Nov 12 09:22:43 2016 -0500
  126. 
  127.     Added IF NOT EXISTS clause to announcements, also added facilityid='1'.
  128. 
  129. commit 9eb0542780c0dad81605ed0e896fdf1dc13fe60d
  130. Author: Michael Born <mborn319@gmail.com>
  131. Date:   Sat Nov 12 09:19:03 2016 -0500
  132. 
  133.     Fixed slide announcement id form
  134. 
  135. commit eaf70a5c8b2760e39792876e9c65ee75747cf8f3
  136. Author: Michael Born <mborn319@gmail.com>
  137. Date:   Sat Nov 12 09:08:56 2016 -0500
  138. 
  139.     Added announcement image to assets dir
  140. 
  141. commit 325f0b3681df71528abf80470f135fe534e35622
  142. Author: Michael Born <mborn319@gmail.com>
  143. Date:   Sat Nov 12 09:08:21 2016 -0500
  144. 
  145.     Fixed bug where unable to add new slide because slideData is NULL.
  146. 
  147. commit fe49abe02e769f247ffe6541e34cf63bce78dc3d
  148. Author: Michael Born <mborn319@gmail.com>
  149. :
  150. [?1l>]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ git push origin master
  151. Counting objects: 173, done.
  152. Delta compression using up to 4 threads.
  153. Compressing objects:   0% (1/171)  
  154. Compressing objects:   1% (2/171)  
  155. Compressing objects:   2% (4/171)  
  156. Compressing objects:   3% (6/171)  
  157. Compressing objects:   4% (7/171)  
  158. Compressing objects:   5% (9/171)  
  159. Compressing objects:   6% (11/171)  
  160. Compressing objects:   7% (12/171)  
  161. Compressing objects:   8% (14/171)  
  162. Compressing objects:   9% (16/171)  
  163. Compressing objects:  10% (18/171)  
  164. Compressing objects:  11% (19/171)  
  165. Compressing objects:  12% (21/171)  
  166. Compressing objects:  13% (23/171)  
  167. Compressing objects:  14% (24/171)  
  168. Compressing objects:  15% (26/171)  
  169. Compressing objects:  16% (28/171)  
  170. Compressing objects:  17% (30/171)  
  171. Compressing objects:  18% (31/171)  
  172. Compressing objects:  19% (33/171)  
  173. Compressing objects:  20% (35/171)  
  174. Compressing objects:  21% (36/171)  
  175. Compressing objects:  22% (38/171)  
  176. Compressing objects:  23% (40/171)  
  177. Compressing objects:  24% (42/171)  
  178. Compressing objects:  25% (43/171)  
  179. Compressing objects:  26% (45/171)  
  180. Compressing objects:  27% (47/171)  
  181. Compressing objects:  28% (48/171)  
  182. Compressing objects:  29% (50/171)  
  183. Compressing objects:  30% (52/171)  
  184. Compressing objects:  31% (54/171)  
  185. Compressing objects:  32% (55/171)  
  186. Compressing objects:  33% (57/171)  
  187. Compressing objects:  34% (59/171)  
  188. Compressing objects:  35% (60/171)  
  189. Compressing objects:  36% (62/171)  
  190. Compressing objects:  37% (64/171)  
  191. Compressing objects:  38% (65/171)  
  192. Compressing objects:  39% (67/171)  
  193. Compressing objects:  40% (69/171)  
  194. Compressing objects:  41% (71/171)  
  195. Compressing objects:  42% (72/171)  
  196. Compressing objects:  43% (74/171)  
  197. Compressing objects:  44% (76/171)  
  198. Compressing objects:  45% (77/171)  
  199. Compressing objects:  46% (79/171)  
  200. Compressing objects:  47% (81/171)  
  201. Compressing objects:  48% (83/171)  
  202. Compressing objects:  49% (84/171)  
  203. Compressing objects:  50% (86/171)  
  204. Compressing objects:  51% (88/171)  
  205. Compressing objects:  52% (89/171)  
  206. Compressing objects:  53% (91/171)  
  207. Compressing objects:  54% (93/171)  
  208. Compressing objects:  55% (95/171)  
  209. Compressing objects:  56% (96/171)  
  210. Compressing objects:  57% (98/171)  
  211. Compressing objects:  58% (100/171)  
  212. Compressing objects:  59% (101/171)  
  213. Compressing objects:  60% (103/171)  
  214. Compressing objects:  61% (105/171)  
  215. Compressing objects:  62% (107/171)  
  216. Compressing objects:  63% (108/171)  
  217. Compressing objects:  64% (110/171)  
  218. Compressing objects:  65% (112/171)  
  219. Compressing objects:  66% (113/171)  
  220. Compressing objects:  67% (115/171)  
  221. Compressing objects:  68% (117/171)  
  222. Compressing objects:  69% (118/171)  
  223. Compressing objects:  70% (120/171)  
  224. Compressing objects:  71% (122/171)  
  225. Compressing objects:  72% (124/171)  
  226. Compressing objects:  73% (125/171)  
  227. Compressing objects:  74% (127/171)  
  228. Compressing objects:  75% (129/171)  
  229. Compressing objects:  76% (130/171)  
  230. Compressing objects:  77% (132/171)  
  231. Compressing objects:  78% (134/171)  
  232. Compressing objects:  79% (136/171)  
  233. Compressing objects:  80% (137/171)  
  234. Compressing objects:  81% (139/171)  
  235. Compressing objects:  82% (141/171)  
  236. Compressing objects:  83% (142/171)  
  237. Compressing objects:  84% (144/171)  
  238. Compressing objects:  85% (146/171)  
  239. Compressing objects:  86% (148/171)  
  240. Compressing objects:  87% (149/171)  
  241. Compressing objects:  88% (151/171)  
  242. Compressing objects:  89% (153/171)  
  243. Compressing objects:  90% (154/171)  
  244. Compressing objects:  91% (156/171)  
  245. Compressing objects:  92% (158/171)  
  246. Compressing objects:  93% (160/171)  
  247. Compressing objects:  94% (161/171)  
  248. Compressing objects:  95% (163/171)  
  249. Compressing objects:  96% (165/171)  
  250. Compressing objects:  97% (166/171)  
  251. Compressing objects:  98% (168/171)  
  252. Compressing objects:  99% (170/171)  
  253. Compressing objects: 100% (171/171)  
  254. Compressing objects: 100% (171/171), done.
  255. Writing objects:   0% (1/173)  
  256. Writing objects:   1% (2/173)  
  257. Writing objects:   2% (4/173)  
  258. Writing objects:   3% (6/173)  
  259. Writing objects:   4% (7/173)  
  260. Writing objects:   5% (9/173)  
  261. Writing objects:   6% (11/173)  
  262. Writing objects:   7% (13/173)  
  263. Writing objects:   8% (14/173)  
  264. Writing objects:   9% (16/173)  
  265. Writing objects:  10% (18/173)  
  266. Writing objects:  11% (20/173)  
  267. Writing objects:  12% (21/173)  
  268. Writing objects:  13% (23/173)  
  269. Writing objects:  14% (25/173)  
  270. Writing objects:  15% (26/173)  
  271. Writing objects:  16% (28/173)  
  272. Writing objects:  17% (30/173)  
  273. Writing objects:  18% (32/173)  
  274. Writing objects:  19% (33/173)  
  275. Writing objects:  20% (35/173)  
  276. Writing objects:  21% (37/173)  
  277. Writing objects:  22% (39/173)  
  278. Writing objects:  23% (40/173)  
  279. Writing objects:  24% (42/173)  
  280. Writing objects:  25% (44/173)  
  281. Writing objects:  26% (45/173)  
  282. Writing objects:  27% (47/173)  
  283. Writing objects:  28% (49/173)  
  284. Writing objects:  30% (52/173)  
  285. Writing objects:  31% (54/173)  
  286. Writing objects:  32% (56/173)  
  287. Writing objects:  33% (58/173)  
  288. Writing objects:  35% (61/173)  
  289. Writing objects:  36% (63/173)  
  290. Writing objects:  37% (65/173)  
  291. Writing objects:  38% (66/173)  
  292. Writing objects:  39% (68/173)  
  293. Writing objects:  41% (71/173)  
  294. Writing objects:  42% (73/173)  
  295. Writing objects:  43% (75/173)  
  296. Writing objects:  44% (77/173)  
  297. Writing objects:  45% (78/173)  
  298. Writing objects:  46% (80/173)  
  299. Writing objects:  47% (82/173)  
  300. Writing objects:  48% (84/173)  
  301. Writing objects:  49% (85/173)  
  302. Writing objects:  50% (87/173)  
  303. Writing objects:  51% (89/173)  
  304. Writing objects:  52% (90/173)  
  305. Writing objects:  53% (92/173)  
  306. Writing objects:  54% (94/173)  
  307. Writing objects:  55% (96/173)  
  308. Writing objects:  56% (97/173)  
  309. Writing objects:  57% (99/173)  
  310. Writing objects:  58% (101/173)  
  311. Writing objects:  59% (103/173)  
  312. Writing objects:  60% (104/173)  
  313. Writing objects:  61% (106/173)  
  314. Writing objects:  62% (108/173)  
  315. Writing objects:  63% (109/173)  
  316. Writing objects:  64% (111/173)  
  317. Writing objects:  65% (113/173)  
  318. Writing objects:  66% (115/173)  
  319. Writing objects:  67% (116/173)  
  320. Writing objects:  68% (118/173)  
  321. Writing objects:  69% (120/173)  
  322. Writing objects:  70% (122/173)  
  323. Writing objects:  71% (123/173)  
  324. Writing objects:  72% (125/173)  
  325. Writing objects:  73% (127/173)  
  326. Writing objects:  74% (129/173)  
  327. Writing objects:  75% (130/173)  
  328. Writing objects:  76% (132/173)  
  329. Writing objects:  77% (134/173)  
  330. Writing objects:  78% (135/173)  
  331. Writing objects:  79% (137/173)  
  332. Writing objects:  80% (139/173)  
  333. Writing objects:  81% (141/173)  
  334. Writing objects:  82% (142/173)  
  335. Writing objects:  83% (144/173)  
  336. Writing objects:  84% (146/173)  
  337. Writing objects:  85% (148/173)  
  338. Writing objects:  86% (149/173)  
  339. Writing objects:  87% (151/173)  
  340. Writing objects:  88% (153/173)  
  341. Writing objects:  89% (154/173)  
  342. Writing objects:  90% (156/173)  
  343. Writing objects:  91% (158/173)  
  344. Writing objects:  92% (160/173)  
  345. Writing objects:  93% (161/173)  
  346. Writing objects:  94% (163/173)  
  347. Writing objects:  95% (165/173)  
  348. Writing objects:  96% (167/173)  
  349. Writing objects:  97% (168/173)  
  350. Writing objects:  98% (170/173)  
  351. Writing objects:  99% (172/173)  
  352. Writing objects: 100% (173/173)  
  353. Writing objects: 100% (173/173), 520.02 KiB | 0 bytes/s, done.
  354. Total 173 (delta 122), reused 0 (delta 0)
  355. To git@bitbucket.org:centrevilletech/sign-pilot-v2.git
  356.    1e3131a..a8fefb1  master -> master
  357. ]0;michael@michael-Lenovo-G780: /var/www/Server/signpilot/wwwmichael@michael-Lenovo-G780:/var/www/Server/signpilot/www$ exit
  358. exit
  359.  
  360. Script done on Sat 12 Nov 2016 02:15:34 PM EST
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!